Skip to content

Commit

Permalink
Merge branch 'no-bundled-yapps'
Browse files Browse the repository at this point in the history
  • Loading branch information
SebKuzminsky committed Feb 3, 2018
2 parents c651ec8 + b37eea5 commit be22b73
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 1,510 deletions.
1 change: 1 addition & 0 deletions debian/control.top.in
Expand Up @@ -29,6 +29,7 @@ Build-Depends: debhelper (>= 6),
procps,
psmisc,
desktop-file-utils,
yapps2,
Standards-Version: 3.9.2
Vcs-Browser: https://github.com/LinuxCNC/linuxcnc
Vcs-Git: git://github.com/linuxcnc/linuxcnc.git
Expand Down
24 changes: 0 additions & 24 deletions debian/copyright
Expand Up @@ -18,10 +18,6 @@ Files: src/hal/classicladder/*
Copyright: the LinuxCNC developers
License: LGPL-2.1+

Files: src/hal/utils/yapps.py
Copyright: 1999-2003 Amit J. Patel <amitp@cs.stanford.edu>
License: MIT

Files: src/libnml/*
Copyright: the LinuxCNC developers
License: LGPL-2
Expand Down Expand Up @@ -99,23 +95,3 @@ License: LGPL-2.1+
.
On Debian systems, the complete text of the GNU Lesser General Public
License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.

License: MIT
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1 change: 0 additions & 1 deletion lib/python/yapps/__init__.py

This file was deleted.

41 changes: 0 additions & 41 deletions lib/python/yapps/copyright

This file was deleted.

211 changes: 0 additions & 211 deletions lib/python/yapps/grammar.py

This file was deleted.

0 comments on commit be22b73

Please sign in to comment.